From dd7215f8674b20485e01a5b35396a28b988a9993 Mon Sep 17 00:00:00 2001 From: Jorge Soares Date: Fri, 28 Nov 2014 13:55:22 +0000 Subject: [PATCH] now properly python version dependent test and hopefuly python-x.y-nose dependency will work --- debian/python-pysam-tests.docs | 2 +- debian/python-tests/.#run-unit-test | 1 + debian/python-tests/control | 3 +++ debian/python-tests/run-nose-tests | 8 ++++++++ debian/python3-pysam-tests.docs | 2 +- debian/python3-tests/control | 4 ++-- debian/python3-tests/run-nose3-tests | 8 ++++++++ debian/python3-tests/run-unit-test | 14 -------------- 8 files changed, 24 insertions(+), 18 deletions(-) create mode 120000 debian/python-tests/.#run-unit-test create mode 100644 debian/python-tests/control create mode 100644 debian/python-tests/run-nose-tests create mode 100644 debian/python3-tests/run-nose3-tests delete mode 100644 debian/python3-tests/run-unit-test diff --git a/debian/python-pysam-tests.docs b/debian/python-pysam-tests.docs index 760739f..336cdc4 100644 --- a/debian/python-pysam-tests.docs +++ b/debian/python-pysam-tests.docs @@ -1 +1 @@ -debian/tests/run-unit-test +debian/python-tests/run-nose-tests diff --git a/debian/python-tests/.#run-unit-test b/debian/python-tests/.#run-unit-test new file mode 120000 index 0000000..3e0a2ee --- /dev/null +++ b/debian/python-tests/.#run-unit-test @@ -0,0 +1 @@ +vagrant@debian.31577:1417164804 \ No newline at end of file diff --git a/debian/python-tests/control b/debian/python-tests/control new file mode 100644 index 0000000..faf5cfc --- /dev/null +++ b/debian/python-tests/control @@ -0,0 +1,3 @@ +Tests: run-nose-tests +Depends: @, python-nose, python-pysam-tests, samtools, make +Restrictions: allow-stderr diff --git a/debian/python-tests/run-nose-tests b/debian/python-tests/run-nose-tests new file mode 100644 index 0000000..0d19351 --- /dev/null +++ b/debian/python-tests/run-nose-tests @@ -0,0 +1,8 @@ +#!/bin/sh -e + +if [ "$ADTTMP" = "" ] ; then + ADTTMP=`mktemp -d /tmp/python-pysam-test.XXXXXX` +fi +cd $ADTTMP +cp -a /usr/share/doc/python-pysam/tests/* $ADTTMP +nosetesrs --nocapture diff --git a/debian/python3-pysam-tests.docs b/debian/python3-pysam-tests.docs index 760739f..a3ed821 100644 --- a/debian/python3-pysam-tests.docs +++ b/debian/python3-pysam-tests.docs @@ -1 +1 @@ -debian/tests/run-unit-test +debian/python3-tests/run-nose3-tests diff --git a/debian/python3-tests/control b/debian/python3-tests/control index f1a4bf7..58d8e4f 100644 --- a/debian/python3-tests/control +++ b/debian/python3-tests/control @@ -1,3 +1,3 @@ -Tests: run-unit-test -Depends: @, python-pysam-tests, samtools, make +Tests: run-nose3-tests +Depends: @, python3-nose, python3-pysam-tests, samtools, make Restrictions: allow-stderr diff --git a/debian/python3-tests/run-nose3-tests b/debian/python3-tests/run-nose3-tests new file mode 100644 index 0000000..e710ac5 --- /dev/null +++ b/debian/python3-tests/run-nose3-tests @@ -0,0 +1,8 @@ +#!/bin/sh -e + +if [ "$ADTTMP" = "" ] ; then + ADTTMP=`mktemp -d /tmp/python3-pysam-test.XXXXXX` +fi +cd $ADTTMP +cp -a /usr/share/doc/python3-pysam/tests/* $ADTTMP +nosetests3 --nocapture diff --git a/debian/python3-tests/run-unit-test b/debian/python3-tests/run-unit-test deleted file mode 100644 index 44e94b4..0000000 --- a/debian/python3-tests/run-unit-test +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -e - -if [ "$ADTTMP" = "" ] ; then - ADTTMP=`mktemp -d /tmp/python-pysam-test.XXXXXX` -fi -cd $ADTTMP -cp -a /usr/share/doc/python-pysam/tests/* $ADTTMP -gunzip -r *.py.gz \ - ex9_fail.bam.gz \ - ex9_nofail.bam.gz \ - example_empty_header.bam.gz \ - issue100.bam.gz -chmod u+x ./pysam_test_offline.py -./pysam_test_offline.py -- 2.30.2